Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 9 Feb 2010 00:01:14 +0000 (00:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 9 Feb 2010 00:01:14 +0000 (00:01 +0000)

Trivial merge